From 8d2e8a4505102a9dae15c600e1139bdaf3080ea7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Lindqvist?= Date: Tue, 20 May 2008 17:29:34 +0000 Subject: [PATCH] Remove two chunks of duplicated code (#533733). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-05-20 Björn Lindqvist * gtk/gtkspinbutton.c: (gtk_spin_button_snap, gtk_spin_button_update): Remove two chunks of duplicated code (#533733). svn path=/trunk/; revision=20118 --- ChangeLog | 6 ++++++ gtk/gtkspinbutton.c | 23 ++--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68e59ac1d6..ddacfd725f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-20 Björn Lindqvist + + * gtk/gtkspinbutton.c: (gtk_spin_button_snap, + gtk_spin_button_update): Remove two chunks of duplicated + code (#533733). + 2008-05-20 14:27:34 Tim Janik * reverted recent unapproved changes by Yair Hershkovitz, regarding: diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 8f30b7ad49..f6391da217 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1398,15 +1398,7 @@ gtk_spin_button_snap (GtkSpinButton *spin_button, else val = spin_button->adjustment->lower + ceil (tmp) * inc; - if (fabs (val - spin_button->adjustment->value) > EPSILON) - gtk_adjustment_set_value (spin_button->adjustment, val); - else - { - gint return_val = FALSE; - g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val); - if (return_val == FALSE) - gtk_spin_button_default_output (spin_button); - } + gtk_spin_button_set_value (spin_button, val); } static void @@ -2291,18 +2283,7 @@ gtk_spin_button_update (GtkSpinButton *spin_button) if (spin_button->snap_to_ticks) gtk_spin_button_snap (spin_button, val); else - { - if (fabs (val - spin_button->adjustment->value) > EPSILON) - gtk_adjustment_set_value (spin_button->adjustment, val); - else - { - return_val = FALSE; - g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, - &return_val); - if (return_val == FALSE) - gtk_spin_button_default_output (spin_button); - } - } + gtk_spin_button_set_value (spin_button, val); } static void -- 2.30.2